From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Wed, 26 Mar 2025 09:24:16 +0000 (+0100)
Subject: set CFBundleDevelopmentRegion to "en" and set CFBundleAllowMixedLocalizations
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2^2~64^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=d9b61487580cb274d4762ad79a9c8f4f10a83e52;p=nextcloud-desktop.git

set CFBundleDevelopmentRegion to "en" and set CFBundleAllowMixedLocalizations

according to [1] the value should be a ISO 639-1 code, so let's correct
it

`CFBundleAllowMixedLocalizations` is the most interesting one: with this
being set the reported QLocale will no longer be English as well

(this also bumps the version info to 2025 :D)

[1]: https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundledevelopmentregion

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---

diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
index 4e79cc740..5705f344d 100644
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
         <key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>LSMinimumSystemVersion</key>
+        <string>NSApplication</string>
+        <key>LSMinimumSystemVersion</key>
         <string>11.0</string>
-	<key>LSUIElement</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
+        <key>LSUIElement</key>
+        <true/>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>en</string>
+        <key>CFBundleAllowMixedLocalizations</key>
+        <true/>
         <key>CFBundleExecutable</key>
         <string>@APPLICATION_NAME@</string>
         <key>CFBundleIconFile</key>
@@ -29,7 +31,7 @@
         <key>CFBundleShortVersionString</key>
         <string>@MIRALL_VERSION_STRING@</string>
         <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2024 @APPLICATION_VENDOR_XML_ESCAPED@</string>
+        <string>(C) 2014-2025 @APPLICATION_VENDOR_XML_ESCAPED@</string>
         <key>NSSupportsAutomaticGraphicsSwitching</key>
         <true/>
         <key>NSRequiresAquaSystemAppearance</key>
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 6c00e6b6d..53c85e4b2 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -1003,8 +1003,10 @@ QString substLang(const QString &lang)
 
 void Application::setupTranslations()
 {
+    qCInfo(lcApplication) << "System UI languages are:" << QLocale::system().uiLanguages();
     const auto enforcedLocale = Theme::instance()->enforcedLocale();
     const auto lang = substLang(!enforcedLocale.isEmpty() ? enforcedLocale : QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore).first());
+    qCInfo(lcApplication) << "selected application language:" << lang;
 
     auto *translator = new QTranslator(this);
     auto *qtTranslator = new QTranslator(this);